Merge from trunk; up to r111011.
authorBill Wohler <wohler@newt.com>
Sun, 25 Nov 2012 19:32:40 +0000 (11:32 -0800)
committerBill Wohler <wohler@newt.com>
Sun, 25 Nov 2012 19:32:40 +0000 (11:32 -0800)

Trivial merge